Return FALSE from reparent implementations to avoid #548993. Patch by Ed

2008-08-27  Matthias Clasen  <mclasen@redhat.com>

        * gdk/x11/gdkwindow-x11.c:
        * gdk/win32/gdkwindow-win32.c: Return FALSE from reparent
        implementations to avoid #548993. Patch by Ed Catmur.

svn path=/trunk/; revision=21215

diff --git a/ChangeLog b/ChangeLog
index 94428dc29f8979d314bc16fc5d7404e66b0a6e54..0d3e231e89cd45be686b619ce1befc429606e4fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkwindow-x11.c:
+       * gdk/win32/gdkwindow-win32.c: Return FALSE from reparent
+       implementations to avoid #548993. Patch by Ed Catmur.
+
 2008-08-27  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/printbackends/cups/gtkprintbackendcups.c: Don't capitalize

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 576714ccc5a639a97eaddaf38892429a07db2a72..41a8b42c8ff2065ad78c9f20f4e696e599298d0e 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -1465,7 +1465,7 @@ gdk_win32_window_reparent (GdkWindow *window,
   parent_private->children = g_list_prepend (parent_private->children, window);
   _gdk_window_init_position (GDK_WINDOW (window_private));
 
-  return TRUE;
+  return FALSE;
 }
 
 static void

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index cabebb48fa694d68e0a41a78e634f485c5bf78e5..eb2ae6c85e4935ee4f4f67a2862230bcdf2ba2ef 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1830,7 +1830,7 @@ gdk_window_x11_reparent (GdkWindow *window,
   parent_private->children = g_list_prepend (parent_private->children, window);
   _gdk_window_init_position (GDK_WINDOW (window_private));
 
-  return TRUE;
+  return FALSE;
 }
 
 static void